From d285a773d6f5d7fb4e654291b5fce90bb8ec8852 Mon Sep 17 00:00:00 2001 From: James Carter Date: Sat, 17 Sep 2011 16:20:58 +0100 Subject: [PATCH] xen/xsm: Compile error due to naming clash between XSM and EFI runtime The problem is that efi_runtime_call is the name of both a function in xen/arch/x86/efi/runtime.c and a member of the xsm_operations struct in xen/include/xsm/xsm.h. This causes the macro "#define efi_runtime_call(x) efi_compat_runtime_call(x)" on line 15 of xen/arch/x86/x86_64/platform_hypercall.c to cause the above compile error. Renaming the XSM struct member fixes the problem. Signed-off-by: James Carter Acked-by: Jan Beulich --- xen/arch/x86/platform_hypercall.c | 2 +- xen/include/xsm/xsm.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index db5554c47f..d10024ae94 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -306,7 +306,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) break; case XENPF_efi_runtime_call: - ret = xsm_efi_runtime_call(); + ret = xsm_efi_call(); if ( ret ) break; diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index ffc84a53a8..8d67bbd114 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -132,7 +132,7 @@ struct xsm_operations { int (*physinfo) (void); int (*platform_quirk) (uint32_t); int (*firmware_info) (void); - int (*efi_runtime_call) (void); + int (*efi_call) (void); int (*acpi_sleep) (void); int (*change_freq) (void); int (*getidletime) (void); @@ -554,9 +554,9 @@ static inline int xsm_firmware_info (void) return xsm_call(firmware_info()); } -static inline int xsm_efi_runtime_call (void) +static inline int xsm_efi_call (void) { - return xsm_call(efi_runtime_call()); + return xsm_call(efi_call()); } static inline int xsm_acpi_sleep (void) -- 2.30.2